Backport fix for Bug#11374 from trunk
authorChong Yidong <cyd@gnu.org>
Wed, 2 May 2012 13:08:38 +0000 (21:08 +0800)
committerChong Yidong <cyd@gnu.org>
Wed, 2 May 2012 13:08:38 +0000 (21:08 +0800)

Trivial merge